Merge "Isolate trace search initialization." into main